next steps and small refactors