Small cleanups & phpdoc improvements