Minor bug fixing HTTP-compiled data
Refactoring into better design