refactoring v1.2

refactor only