Minor refactor of ICU casemap