Add some phpdoc/code style corrections