CS Fixes

The docblock changes match the proposed PSR docblock standard, and also match symfony's docblocking standards.