Refactor, change log level