More cosmetic tweaks toward psr-2 compliance