Tidy a few bits