raised camera and cleaned up some code