Update readme
Minor refactoring