Major refactoring session