Fix up some small things

Yeah, that's much cleaner.