3.0 - Cleanup

Just some minor code and docblock cleanup
Sooo, I'll leave it with the returns removed?