Keeping it tidy before it gets messy again