Issue/217 refactor http