3.0 - Cleanup

Just some minor code and docblock cleanup
This return can be useful when mocks are involved.