Cleaning up
Add more config options to camera subclass