some trivial code shuffling
Fix untagged fields warnings