cleaning / commenting