psr-1 and psr-2 compliance cleanup