PHPDoc and code style fixes