V0.5.13: [reformat] reformat code & clean up.