Refactor for easy import of cling source code in the future.