Added angle and colormap variables, cleaning.