Tweaked camera. Minor code refactoring for camera plugin.