Minor edits

Very minor stuff, just tidy ups on the code. It looked like the `returnType` and `type` methods were being used correctly so those have not been changed.