Refactor slightly
Update readme to include more links