Cleanup

Just cleaned the markup. First step :-)