clean code, make it PSR-3 compliant