move common camera effects
more cleaning and rearranging