Refactor, camera