3.0 - Cleanup

Just some minor code and docblock cleanup
Could you elaborate that a bit?