more psr-4 formatting