Provide some service ralted PHPDoc fixes and do some reformatting