cleaning up some code and adding TODOs to the README