Improve coding style to be more PSR-2 compliant