3.0 - Cleanup

Just some minor code and docblock cleanup
Why the removal of all the returns? They are useful for mocking in tests.