Minor refactoring
Readme update