sky2: Refactor sky2_up into two functions