Remove some comments and modify the methods to be more clear.