slightly improve the markup