fix all psr-2 errors again