Code refactor and removed CDN enable as it was not part of the challenge