fixed code style and phpdoc for #2817