Add some code smell TODOs and format the files.