Icehouse refactor