Optimized the code
Mostly for the language handler