code clean up

stuff getting done

detail to come in next commit because i have to play some apb whoop
whoop