PSR-2 Fixes and Spacing for Readability