Added dependencies to read me + refactor extract a bit