code clean up

still needs work