Format to new PSR method conventions