3.0 - Cleanup

Just some minor code and docblock cleanup
Actually its not now that I think about it.