Cleanup template and move message to python code.
[santonelli]