Better naming (state vs status)