Improved formatting somewhat