Major refactoring with CodeMaid