Deleted fields code; indentation tweaks