Improved and renamed the collection script

Some work done by @sharanagrawal. Closes #1.