Refactoring; languages are now sorted