Rename checkins to status
And a bit of other clean up