cleaned up TODO