adding proper comments