Comment added and final cleaning done