let's try a small refactor