Reformat source and, added coments