Adding a Camera and Cleanup

Adding a camera and cleanup.