Please follow PSR-2 here and in the rest of the PR