Cleanup, and fix for field direction.