[REF] Refactoring status code