Better message
Some performance improvements regarding beautify caching