Remove comment.
Improve log output.
Refactor.