Cleaned up the Field and FieldTerminal class.