Cleaning up and motivating partition