Adding in place for Cinder, cleaning code