Some modifications to be PSR-2 compliant