late night refactoring session II