initial cleanup from rubocop