Reformat and refine the code. refs #68