pigjar-16 Code tidy part 2
Merge pull request #20 from trin5tensa/pigjar-14

pigjar-16 Code tidy part 2