Can you format this better and use TODO?