Addressed rubocop comments