Code style changes to comply with PSR 2