Missed a few
Updated spacing for PSR-2