More refactoring, removal of excessive comments