Code style changes
Merge branch 'feature/pmperson' of git.drupal.org:project/pm into feature/pmperson