Refactor the website parsing