Minor clean up and TODOs