psr2 fixes

Address psr2 violations per code sniffer.