PSR-2 compliancy + some quick PSR-1 compliant updates