3.0 - Cleanup

Just some minor code and docblock cleanup