Minor change:
- refactor code