PathCamera - Refactoring