Cleared up some code