Cleanups the code a little bit and reduces amount of arguments passed
throughout the functions.
Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
Reviewed-by: NJiri Denemark <jdenemar@redhat.com>