Renamed some transform functions to be more idiomatic. Removed extraneous logging and improved one TODO text.