refactoring on saturday evening