refactored and condensed static sites