remove some debug lines and add a comments