fix refactoring issues

Signed-off-by: Gowrishankar Rajaiyan <gsr@redhat.com>