next couple of correction
reformat source code