Make mscrape.py a bit more consistent and simple