Clean-up

cleaned up some code.