some tidy work