Some refactor and readme changes