Modified TODO comments for future reference