cleaned up field class