adding descriptive TODOs + code clean up