Made cosmetic changes based on IDEA code analyzer reports
Merge pull request #16 from mikeyman77/ps/codereview

Made cosmetic changes based on IDEA code analyzer reports