Minor changes
some refactor