Refactoring (#8)