Cleaning up private/public fields (for nicer godoc)