Implemented review comments to remove unwanted statements