Update readme
Some refactoring and comment adding