code cleaning:comments etc.