Cleanup comment and definition fields