7. Refactoring tasks, properties, bussines logic