Improved formatting and structure