Refactor of HTML data collectors