refactored output handlers for all modules
removed kexport
readability clean up