cleaned up field definitions a bit