Improved TODOs
Replaced loop with regex for camelized to underscore
Removed outdated TODO