Cleaned up TODO comments