cleaning up the markup a bit