Minor changes

- refactoring