field cleanup and adjustments