Bringing the effects module closer to being inline with the style guideline.