Code refactoring, Syntactic sugar & making the app translatable part2