More refactorings (demeter etc.)