[FACTOR] Camera and general refactoring