Final finishing touches to camera refactoring