Refactor even more