Minor re-factoring and some updates to the readme