More optimisations for Contrast X

Style, level and speed tweaks!