Refactoring camera