CleanUp, fixed old comments