refactor & update readme