Code reformat and small fix