1) Rename of some local vars to no longer contain the "dart" word
2) TODOs regarding a commented out code