A little more refactor