Minor refactoring
Update README