move unless for clarity