Cleaning up PHPDocs and minor adjustments to code alignment