commenting + file system cleaning