cleaned up the markup a bit