Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: othercorey <3316bf59d2e1d768e3c8193f059c4d1c7550959d@gmail.com>
ndm2/cakephp,ndm2/cakephp,cakephp/cakephp,ndm2/cakephp,cakephp/cakephp,cakephp/cakephp,cakephp/cakephp,ndm2/cakephp