Added notes and prettified mark-up