Minor code styling and phpdoc changes.