Started small refactoring