remove extra comments and fix an issue