issue #969 reorganize field declarations