Added missing language entries
Some code refactorings to improve code readability
move static code up
Fixed some missed changes
Some code refactoring to improve code readability, reusability and searchability
Fixed missed changes