Improve code a little bit
Improve code a little bit

Tried to simplify the code to make it better readable.
Removed some obsolete parameters.

ibm-genwqe/genwqe-user,ferseiti/genwqe-user,ibm-genwqe/genwqe-user,tblume/genwqe-user,tblume/genwqe-user,ibm-genwqe/genwqe-user,ferseiti/genwqe-user