Refactor for CodeLanx