Improve markup