Refactored some conditionals in camera control