Fix Fade effect with Time = 0 and cleanup some code