Simple refactoring if->switch
Renamed language files, correct use