Refactoring and bugfixing

Signed-off-by: Marco Crivellari <marco.crivellari@suse.com>
3 files changed