Refactor

Refactoring and camera updates.