MOTM-730: Updated code to PSR standards