Refactor statuses to static