Refactor and update README