pigjar-58 Code Tidy. TODOs cleared.