[REF] Refactorig 200 status code