Refactor and clean up update site repository