tweaked usage of cleanup action; converted should* variables to booleans for better string conversion