Add some TODOs to Readme
Refactor code