Few small refactorings, more to come