simplified the HTTP part
cleand up & simplified code base