Moving avg fading + minor refactor