Fix any TODO's in comments

[adamgulde]

If you ever leave a "TODO" note in a comment, or if you find one throughout the code, these are always up for grabs for anyone to fix. If you have any questions about the TODO because it's not thoroughly described, reach out to @adamgulde or the TODO writer to clarify.

TODOs generally do not break code, but are often indicative of bad practices and the programmer recognizes they (or someone else) need to correct it to reflect better practices or functionality.