cleanings, code reformat.