Reformatted markup a bit