Merge branch 'fix-30' into HEAD
Whitespace fixes.
Moves the cleanup method to a local scope.
Adds missing var.
More formatting fixes.
Fixes whitespace.
Enables <head> and <body> tags in templates.