Improve language enhancement methods
Simplify log messages