Changed the conditional structure of cleanup.rb