miscellaneous cleanup
Merge pull request #84 from mikeyman77/ps/cleanup

miscellaneous cleanup