Simplify and improve camera handling