refactoring
code cleanup
added logging