Docbloks and PSR-2 fixes.