Refactoring of old code as well