Refactoring SRHTTP