Refactoring => less code