Typos / Add TODO
Typo
Making strings translatable
Configuration moved to single class
Remove step
CommandDispatcher: Simplify switch
Rename classes