Improve internal markup