Add some better comments