misc formatting cleanup