Refactoring can be hell...