restructure checkStatus branches