minor refactors / todos