Add notes and improve format