code cleanup (make formation of cleanupSteps more readable)