cleaned up code
cleaned up some code