Merge pull request #401 from wolfmanjm/fix/cleanup-private-fields