More work on formatting. Reduce line usage.