cleaned up some code
cleaned code