further code refactoring and added test

fixed tests and internationalisation issues

added translators comment and pulled text to same line

changes based on feedback

updated doctoring to make it more unstandable

further optimizations