Refactor to pull out div names