Even more refactor