small tweaks to rendering

to be more consistent and PSR compatible