Some tidy work