cleaned up TODO a bit