Small renaming and move of effects
small cleanup