Added clean method to main sub