Changed the TODOs and fixed indentation.