Refactor the way I handle site and sites list.