1-minimal code cleaning / PSR-styling