Refactor pass
Make the README a bit nicer