Clean up markup a bit