Refactors cirrus.