Simplifies the code, enables easier enhancing

Change-Id: I644befc903b2537053b214dfdef3f51dc7af216a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>