Cleanup: fields, logging, comments.