Added notes, prettified mark-up