Blender Git Loki

Cleanup: Reduce indentation level and variable scope

Exit early in some functions to reduce indentation level, declare
variables where they are initialized, and also clean up some
comment formatting.