cleaned up some code
cleaned up some code