tidying up a messy push