Improve some markup