coding clean up

cleaned up some code