Refactor to Elucidator.NL