* Remove escape where not needed ('-', ',')
* Remove brackets for single symbols (\d, \w)

Change-Id: I2595bfc775f93aeddc367d8889cd78fb5a3fac83
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>