Made some more refactorings, removed unused private field