Tidying camera logic