Code style fixing, adding of fading speed