code reformat
code reformat + field alignment