B-58092 minor todo changes, whitespace, import cleanup