3.0 - Cleanup

Just some minor code and docblock cleanup
I am not sure, but do the "view vars" need to be camelBacked here?