Fix log messages.
Rearrange header file.