20131014-1604: Reformat the code