Refactoring, remove some redundant method
some refactoring