Minor refactor
Minor refactor
Update README