Put clean method in a more usable format