Minor clean up
Renamed a function
Added TODO comments