Started small refactor.