Cleaned up messages for tools/generate.sh