Fixing inconsistent formatting, and reducing some duplicated code
Merge pull request #11 from jbohren-forks/formatting-consistent-pid-args

Fixing inconsistent formatting / naming, and reducing some duplicated code
Merging changes from other branch