Cleaned up data

This is from #191 submitted by @mrclay.