Improved code on the  static content