Made tiny refactorings on Camera / Viewport logic