Improved formatting. #819