Fix tests and little refactoring + code style
Get rid of copy paste
Use Ometa/JS for adding space to start
Refactor for use Ometa/JS
Normalize strings code style
Remove unnecessary subrule
Inline variable
Code style