Improve scraper code a bit (cleanup, comments,...)