Feature envy fixed