Refactor and doc enhancements to safe ICICLE generation