Code cleanup + README-> TODOs