Less refactoring