Add More Comment and remove unwanted things.