fixed readme and refactoring