- [#4] Improved logging separation
- do some refactoring
- improved logging information