Camera update

Cleaned up the camera (made public)