Half way through func converstion.
Refactored.
Small rename.
Refactored function name.