Clean up formatting and fix Fade not to use fake smoothing.