Improve camera lifecycle