Complete cleanup into "class"