Tidy up exported/non-exported fields