Keep things tidy