pigjar-14 Code tidy

OK to merge