minor refactoring, updated readme