Reduced HTTP-request count + formatting cleanup