Very light refactor