Refactor form checkin