Refactor static pages spec 1/4