normalize log messages
refactor to object, and use class configurations
clean up some syntax
Merge branch 'refactoring' into develop