Httl refactoring