MOB-1530

**DO NOT MERGE YET**
each variable should be declared in new line