Some formatting changes towards becoming PSR compliant