Little more refactor