Fix issue with import (kitchen) and refactoring the code.
Fix issue with import (kitchen) and refactoring the code.

sayanchowdhury/fedmsg_meta_fedora_infrastructure,fedora-infra/fedmsg_meta_fedora_infrastructure,opoplawski/fedmsg_meta_fedora_infrastructure,Ghost-script/fedmsg_meta_fedora_infrastructure