#169 logs updated, refactoring