refactoring, updated readme