cleanup of FieldLayout.java