minor refactoring
gettin betta
nothing seems to work