Tidy up some code in small ways. Use store for fields.