- formatting cleanup for easier editing