Checkin refactor