Fixed submodule.
Refactoried and well-formatted.
Internationalized.