time to refactor?