Adding better comments