cosmetic
move functions to a better place
oops