reformat
code re-arrangement