redacting comment
added TODOs; copy cleanup