Added fixes for rubocop complaints