Extract UI_PARAMS
whitespace
Merge pull request #117 from pitr-ch/master

Extracting UI_PARAMS && whitespace formatting