minor refactoring and cleaning + readme