Cleaning up -fieldstart and implementing -fieldend