Refactored Bad request part