CleverExtension moved to pycodeexport + minor refactorign