3.0 - Cleanup

Just some minor code and docblock cleanup
It would be clearer, maybe, and would look less like an accidental typo :)