Refactoring code
update log