clean up

cleaned up the code