tweaked usage of cleanup action

also converted should* variables to booleans for better string conversion