Use proper log formatting.
Don't use hardcoded constants anywhere.
Merged 0f919b0c4b667895706a42ff5c6970f042cd44b0 in.