Clean some comments and let it easier to read