#49 minor refactoring
#49 minor refactoring
#49 minor refactoring
#49 minor refactoring
#49 remove unnec' log statement
#49 minor refactoring