cleaning up orange code