More work on cleaning up camera code