Refactor + readme