small refactoring (mostly removing extra methods)