field alignment fixes and code reformat