rework fields, cleanup, simplified