starting small refactor