Clead up some code.