code cleaning & psr-2