Cinder refactoring.