Cleaned up TODO