small refactor
cleanup
todo