general formatting cleanup