Before refactoring all code