Meta field class cleanup/refactoring