ported IOC refactorings to CLJs