DRYs up code a little, changes README