code style, log edit, refactoring