clean up, refactor general page structure/instantiation