Some more refactoring and preparing for camera refactoring