Remove more comment and Close #4