code clean up, added TODOs