late night refactoring session III