Please fix CS: newlines around logical blocks and PSR-2 generally