Refactoring again and again!