refactoring or year and testing