Improve markup readability