CS Fixes

The docblock changes match the proposed PSR docblock standard, and also match symfony's docblocking standards.
Cut off a closing bracket here that's causing the tests to fail.