field naming convention; cleanup