Update usage and improve markup