logger levels improved
code refactoring