refactoring and beauty