changed variable designations to match PSR2 with removal of '_'