did some refactoring
did some refactoring