Refactoring / less