Refactor and improve readme