Refactor units as pure sets, use only row and col