Blender Git Loki

Cleanup: Rearrange code, rename function

Move the static functions higher in the file so they are usabl
for an upcoming patch, and make it use clearer names instead
of overloading a function name.