Cleared up the code