field members moved to tops of classes; formatted source