Further improved formatting