post-merge cleanup
post-merge cleanup

* renamed internal variables for consistency
* fixed STYLE issues
* fixed undefined handling

FND/tiddlyspace,FND/tiddlyspace,TiddlySpace/tiddlyspace,TiddlySpace/tiddlyspace,TiddlySpace/tiddlyspace,FND/tiddlyspace