Code improvement
Fade-in / Fade-out