Keep it tidy