mainly formatting cleanup