refactored (coolly simplified)
renamed