Clean up markup
Link to Microsoft study