cleaned up the markup