Slight refactor and README updates.