diff --git a/bin/cgilib.rc b/bin/cgilib.rc
index a2824b5..e17ad36 100644
--- a/bin/cgilib.rc
+++ b/bin/cgilib.rc
@@ -1,7 +1,7 @@
 ##############################################
 # Useful CGI functions
 
-NEW_LINE = '
+NEW_LINE='
 '
 
 fn dprint { echo $* >[1=2] }
@@ -20,21 +20,21 @@ fn get_post_args {
     if(~ $#POST_ARGS 0) {
         ifs='&
 '       for(pair in `{cat}) {
-            pair = `{echo -n $pair | sed 's/=/\&/'} \
+            pair=`{echo -n $pair | sed 's/=/\&/'} \
             # Maybe we should urldecode on the first pass?
-            POST_ARGS = ($POST_ARGS $pair)
+            POST_ARGS=( $POST_ARGS $pair )
             ifs=() \
             if(~ $pair(1) $*)
-                $pair(1) = `{echo -n $pair(2) | urldecode | tr -d '
'}
+                $pair(1)=`{echo -n $pair(2) | urldecode | tr -d '
'}
         }
     }
     if not {
-        pa = $POST_ARGS
+        pa=$POST_ARGS
         while(! ~ $#pa 0) {
             ifs=() \
             if(~ $pa(1) $*)
-                $pa(1) = `{echo -n $pa(2) | urldecode | tr -d '
'}
-            pa = $pa(3-)
+                $pa(1)=`{echo -n $pa(2) | urldecode | tr -d '
'}
+            pa=$pa(3-)
         }
     }
 }
@@ -48,7 +48,7 @@ fn awk_buffer {
             buf = ""
         }
     }
-    END{ printf "%s", buf }'
+    END { printf "%s", buf }'
 }
 
 fn urldecode {
@@ -65,7 +65,7 @@ BEGIN {
 }
 {
     decoded = ""
-    i   = 1
+    i = 1
     len = length ($0)
     while ( i <= len ) {
         c = substr ($0, i, 1)
@@ -95,11 +95,11 @@ BEGIN {
 }
 
 fn crop_text {
-    max_chars = $1
+    max_chars=$1
 
-    ellipsis = '...'
+    ellipsis='...'
     if(~ $#* 2)
-        ellipsis = $2
+        ellipsis=$2
 
     awk -v max'='^$"max_chars^' ' -v 'ellipsis='$ellipsis '
     {
@@ -116,9 +116,9 @@ fn crop_text {
 # Cookies
 fn set_cookie {
     # TODO: should check input values more carefully
-    name = $1
-    val = $2
-    extraHttpHeaders = ($extraHttpHeaders 'Set-cookie: '^$"name^'='^$"val^'; path=/;')
+    name=$1
+    val=$2
+    extraHttpHeaders=( $extraHttpHeaders 'Set-cookie: '^$"name^'='^$"val^'; path=/;' )
 }
 fn get_cookie {
     ifs=';' { co = `{ echo $HTTP_COOKIE } }
@@ -128,7 +128,7 @@ fn get_cookie {
     #        echo $c|sed 's/[^=]*=//' 
 
     # WARNING: we might be adding a trailing new line
-    { for(c in $co) echo $c} | sed -n 's/[^=]*=//p' 
+    { for(c in $co) echo $c } | sed -n 's/[^=]*=//p' 
 }
 
 
@@ -142,10 +142,10 @@ fn template { template.awk $* | rc $rcargs }
 fn parse_rec {
     ifs='
 ' for(i in `{sed 's/% *//g; /^$/q' < $1}) {
-        v = `{echo -n $i | sed 's/^/rec_/; s/=.*//;'} 
-        $v = `{echo -n $i | sed 's/^[^=]*=//'}
+        v=`{echo -n $i | sed 's/^/rec_/; s/=.*//;'} 
+        $v=`{echo -n $i | sed 's/^[^=]*=//'}
     }
-    ifs=() { rec_data = `{sed -n '/^[^%]./,$p' < $1} }
+    ifs=() { rec_data=`{sed -n '/^[^%]./,$p' < $1} }
 }
 
 
@@ -163,7 +163,7 @@ fn login_user {
 fn check_user {
     if(! get_user)
         status='Not logged in'
-    if not if (! ~ $#1 0 && ! grep -s '^'^$logged_user^'$' etc/groups/$1)
+    if not if(! ~ $#1 0 && ! grep -s '^'^$logged_user^'$' etc/groups/$1)
         status=User $logged_user not in group $1
     if not
         true
@@ -171,19 +171,19 @@ fn check_user {
 
 # If not logged in, try to get user login info from POST info or from cookie
 fn get_user {
-    if (~ $#logged_user 0) {
-        if (~ $#* 2) {
-            user_name = $1 
+    if(~ $#logged_user 0) {
+        if(~ $#* 2) {
+            user_name=$1 
             user_password $2
         }
         if not if(~ $REQUEST_METHOD POST)
             get_post_args user_name user_password
 
         if(~ $#user_name 0) { 
-            ifs=':' { cu = `{get_cookie werc_user|tr -d $NEW_LINE} }
+            ifs=':' { cu=`{get_cookie werc_user|tr -d $NEW_LINE} }
             if(! ~ $#cu 0) {
-                user_name = $cu(1) 
-                user_password  = $cu(3)
+                user_name=$cu(1) 
+                user_password=$cu(3)
             }
         }
         auth_user $user_name $user_password
@@ -195,19 +195,19 @@ fn get_user {
 # Check if user_name and user_password represent a valid user account
 # If valid, 'log in' by setting logged_user
 fn auth_user {
-    user_name = $1
-    user_password = $2
+    user_name=$1
+    user_password=$2
 
-    pfile = 'etc/users/'^$"user_name^'/password'
-    if (~ $#user_name 0 || ~ $#user_password 0)
+    pfile='etc/users/'^$"user_name^'/password'
+    if(~ $#user_name 0 || ~ $#user_password 0)
         status='Auth: missing user name or pass: '^$"user_name^' / '^$"user_password
     if not if(! test -f $pfile)
         status='Auth: cant find '^$pfile
-    if not if (! ~ $user_password `{cat $pfile})
+    if not if(! ~ $user_password `{cat $pfile})
         status='Auth: Pass '$user_password' doesnt match '^`{cat $pfile}
     if not {
-        logged_user = $user_name
-        logged_password = $user_password
+        logged_user=$user_name
+        logged_password=$user_password
         dprint Auth: success
     }
 }
@@ -215,21 +215,20 @@ fn auth_user {
 
 
 # Blog stuff
-
 fn make_blog_post {
-    bdir = $1
-    btitle = $2
-    btext = $3
+    bdir=$1
+    btitle=$2
+    btext=$3
     if(! ~ 0 $#1 $#2 $#3) {
         date=`{/bin/date +%F}
 
-        n = 1
+        n=1
         for(f in $bdir^$date^'-'*) {
-            i = `{echo -n $f | sed -n 's,^.*/'$date'-([0-9]+)_.*,\1,p'|tr -d $NEW_LINE}
+            i=`{echo -n $f | sed -n 's,^.*/'$date'-([0-9]+)_.*,\1,p'|tr -d $NEW_LINE}
             if(! ~ $#i 0 && test $i -ge $n)
-                n = `{hoc -e $i'+1'}
+                n=`{hoc -e $i'+1'}
         }
-        btitle = `{echo -n $"btitle | sed 's/[ 	]+/_/g; 1q'}
+        btitle=`{echo -n $"btitle | sed 's/[ 	]+/_/g; 1q'}
 
         echo $btext > $bdir^'/'^$"date^'-'^$"n^_$"btitle.md 
     }
@@ -240,20 +239,20 @@ fn make_blog_post {
 fn sortedBlogPostList {
     # the /./->/|/ are added so we can sort -t| and order only the file name
     # NOTE: this breaks if any path element in blogDirs contain '/./' or '|'
-    if (! ~ $#* 0)
+    if(! ~ $#* 0)
         ls $*^'/./' | sed -n 's,/\./,/|/,; /\/[0-9]+.*\.md$/p' | sort -r '-t|' +1 | sed 's,/+\|/+,/,'
 }
 
 fn gen_blog_post_title {
     title=`{basename $1 | sed 's/^[0-9\-]*_(.*)\.md$/\1/; s/_/ /g' }
-    permlink= `{echo $1 | sed 's,^/[a-z/]*www/,/,; s,^sites/[^/]*/*/,/,; s/\.md$//' }
+    permlink=`{echo $1 | sed 's,^/[a-z/]*www/,/,; s,^sites/[^/]*/*/,/,; s/\.md$//' }
     du=`{ls -l $1}
-    by = ''
-    if (! ~ $#blogAuthor 0) {
-        if (! ~ $blogAuthor '')
+    by=''
+    if(! ~ $#blogAuthor 0) {
+        if(! ~ $blogAuthor '')
             by='By '$"blogAuthor
     }
-    if not if (~ $#blogDirs 1)
+    if not if(~ $#blogDirs 1)
         by='By '$du(4)
     echo '##<a href="'^$"permlink^'">' $"title^'</a> *( '$by Last mod: $du(7 8 9) ' )*'
 }
@@ -263,15 +262,15 @@ fn gen_blog_post_title {
 # App framework
 
 
-app_list = ( hello )
+app_list=( hello )
 
 fn select_apps {
-    found = ()
+    found=()
     for(a in $app_list) {
         . ./apps/$a/app.rc
         if($a^'_test') {
             $a^'_setup'
-            found = yes
+            found=yes
         }
     }
 
@@ -280,7 +279,6 @@ fn select_apps {
 
 fn app_handler {
     $app_body_handler
-        
 }
 
 
diff --git a/bin/werc.rc b/bin/werc.rc
index 1b0af3e..b2474e6 100755
--- a/bin/werc.rc
+++ b/bin/werc.rc
@@ -6,11 +6,11 @@ forbidden_uri_chars='[^a-zA-Z0-9_+\-\/\.]'
 response_format=html
 
 fn get_lib_file {
-    if (test -f $sitedir/_werc/lib/$1)
+    if(test -f $sitedir/_werc/lib/$1)
     	echo -n $sitedir/_werc/lib/$1
     if not if(! ~ $#masterSite 0 && test -f $sitesdir/$masterSite/_werc/lib/$1)
     	echo -n       $sitesdir/$masterSite/_werc/lib/$1
-    if not if (test -f lib/$1)
+    if not if(test -f lib/$1)
     	echo -n        lib/$1
 }
 
@@ -21,24 +21,24 @@ fn gentitle {
 
 # Don't change var name or trailing ';', dirfilter might be changed from _werc/config!
 # TODO: Specify the canonical path input format handled by dirfilter
-dirfilter = 's,/+\./+,/,g; /\/[._]/d; /'^$forbidden_uri_chars^'/d; /^\/(robots|sitemap)\.txt$|\/index\.(md|html|txt|tpl)$/d; /_werc\/?$/d; s,^\./,,; s,\.(md|html|txt)$,,; '
+dirfilter='s,/+\./+,/,g; /\/[._]/d; /'^$forbidden_uri_chars^'/d; /^\/(robots|sitemap)\.txt$|\/index\.(md|html|txt|tpl)$/d; /_werc\/?$/d; s,^\./,,; s,\.(md|html|txt)$,,; '
 
 # To be used from config files
 fn hide_paths {
     for(i in $*)
-       dirfilter = $dirfilter^'/^'$i'$/d; '
+       dirfilter=$dirfilter^'/^'$i'$/d; '
 }
 
 # Sidebar 
 fn gensidebar {
     for(d in ./ $args) {
        dd=$"dd^'/'^$d
-       dirs = ( $sitedir^$dd $dirs )
+       dirs=( $sitedir^$dd $dirs )
     }
     # Ignore stderr, last item in path might be a file that doesn't exist (eg., foo for foo.md)
     ls -F $dirs >[2]/dev/null | sed 's/\*$//; s,^'$sitedir',,; '^$dirfilter | sort -u | awk -F/ ' 
     function p(x, y, s) {
-        for( i=0; i < x-y; i+=1)
+        for(i=0; i < x-y; i+=1)
             print s 
     }
 
@@ -70,8 +70,8 @@ fn gensidebar {
 
 # Handlers
 fn set_handler {
-    handler = $1
-    handler_args = $*(2-)
+    handler=$1
+    handler_args=$*(2-)
 }
 
 fn md_handler { cat $* | $formatter }
@@ -86,22 +86,22 @@ fn txt_handler {
     echo '<pre>'
     # XXX Insering a blank line between lines in input is good for fortunes.txt, but maybe not for other .txt files
     # XXX Words are not broken, even if they are way beyond 82 chars long
-    cat $1 |sed 's/$/\n/g; s/</\&lt;/g; s/>/\&gt;/g' |fmt -l 82 -j
+    cat $1 | sed 's/$/\n/g; s/</\&lt;/g; s/>/\&gt;/g' | fmt -l 82 -j
     echo '</pre>'
 }
 
 fn dir_listing_handler {
-    d = `{basename -d $1}
+    d=`{basename -d $1}
     echo $d|sed 's,.*//,,g; s,/$,,; s,/, / ,g; s,.*,<h1 class="dir-list-head">&</h1> <ul class="dir-list">,'
     # Symlinks suck: '/.' forces ls to list the linked dir if $d is a symlink.
-    ls -F $d/. | sed -e 's/\*$//; '^$dirfilter' s,.*/([^/]+/?)$,<li><a href="\1">\1</a></li>,'
+    ls -F $d/. | sed 's/\*$//; '^$dirfilter' s,.*/([^/]+/?)$,<li><a href="\1">\1</a></li>,'
     echo '</ul>'
 }
 
 fn 404_handler { template `{ get_lib_file 404.tpl } }
 
 fn blog_dir_handler {
-    blogDirs = $*
+    blogDirs=$*
     tpl_handler lib/feeds/html.tpl
 }
 
@@ -113,24 +113,24 @@ fn blog_post_handler {
 
 fn select_handler {
 
-    if (test -f $body.md) {
-        if (! ~ $#inBlog 0)
+    if(test -f $body.md) {
+        if(! ~ $#inBlog 0)
             set_handler blog_post_handler $body.md
         if not
             set_handler md_handler $body.md
-        if (! ~ $#allowComments 0 && ~ $REQUEST_METHOD POST) {
+        if(! ~ $#allowComments 0 && ~ $REQUEST_METHOD POST) {
             get_post_args comment_text
-            d = `{date -n} # FIXME Obvious race
-            d = $body.md_werc/comments/$d/
+            d=`{date -n} # FIXME Obvious race
+            d=$body.md_werc/comments/$d/
 
-            u = $logged_user
-            if (~ $#logged_user 0) {
+            u=$logged_user
+            if(~ $#logged_user 0) {
                 get_post_args comment_user_name comment_user_password
                 # TODO Should take this path too if the user can login but doesn't
                 # belong to required group
-                if (! login_user $comment_user_name $comment_user_password) {
-                    u = $comment_user_name ':' $comment_user_password
-                    d = $d^'_pending'
+                if(! login_user $comment_user_name $comment_user_password) {
+                    u=$comment_user_name ':' $comment_user_password
+                    d=$d^'_pending'
                 }
                 if not
                     u = $logged_user
@@ -142,52 +142,47 @@ fn select_handler {
             echo $comment_text > $d/body
         }
     }
-    if not if (test -f $body.tpl)
+    if not if(test -f $body.tpl)
         set_handler tpl_handler $body.tpl
 
-    if not if (test -f $body.html)
+    if not if(test -f $body.html)
         set_handler html_handler $body.html
 
     # Explicit .html urls, unfortunately usually the web server will handle this as static files
-    if not if (~ $body *.html && test -f $body)
+    if not if(~ $body *.html && test -f $body)
         perm_redirect `{ echo $REQUEST_URI|sed 's/.html$//' }
 
     # Rss feeds. TODO: we should check that the request is for a real blog dir
-    if not if (~ $REQUEST_URI */index.rss */index.atom) {
-        uri = `{echo $uri | sed 's/index.(rss|atom)$//'}
-        if (~ $#blogDirs 0)
-            blogDirs = $sitedir^'/'$uri
+    if not if(~ $REQUEST_URI */index.rss */index.atom) {
+        response_format=raw
+        uri=`{echo $uri | sed 's/index.(rss|atom)$//'}
+        if(~ $#blogDirs 0)
+            blogDirs=$sitedir^'/'$uri
         uri=$baseuri$"uri
 
-        if (~ $REQUEST_URI */index.rss) {
+        if(~ $REQUEST_URI */index.rss)
             master_template=feeds/rss20.tpl
-        }
-        if not if (~ $REQUEST_URI */index.atom) {
+        if not if(~ $REQUEST_URI */index.atom)
             master_template=feeds/atom.tpl
-        }
-
-        response_format=raw
     }
 
     # Blog handler
-    if not if (~ $body */[bB]log/index */[bB]log//index || ! ~ $#blogDirs 0) {
-        if (~ $#blogDirs 0)
-            blogDirs = `{basename -d $body}
+    if not if(~ $body */[bB]log/index */[bB]log//index || ! ~ $#blogDirs 0) {
+        if(~ $#blogDirs 0)
+            blogDirs=`{basename -d $body}
 
         u=`{cleanname $baseuri^`{basename -d '/'^$uri}|sed 's,:/,://,'} # Sed recovers '/' in 'http:/' stripped by cleanname
         extraHeaders=$"extraHeaders ^ \
     	'<link rel="alternate" type="application/rss+xml" title="RSS" href="'$"u'/index.rss" />
-<link rel="alternate" type="application/atom+xml" title="ATOM" href="'$"u'/index.atom" />
-
-'
+<link rel="alternate" type="application/atom+xml" title="ATOM" href="'$"u'/index.atom" />'
         set_handler tpl_handler lib/feeds/html.tpl
     }
 
     # Global tpl (eg sitemap.tpl)
-    if not if (test -f lib/^$uri^.tpl)
+    if not if(test -f lib/^$uri^.tpl)
         set_handler tpl_handler lib/^$uri^.tpl
 
-    if not if (test -f $body.txt)
+    if not if(test -f $body.txt)
         set_handler txt_handler $body.txt
 
     # Dir listing
@@ -207,11 +202,7 @@ fn select_handler {
 
 }
 
-
-fn genbody {
-    $handler $handler_args
-}
-
+fn genbody { $handler $handler_args }
 
 # Careful, the proper p9p path might not be set until initrc.local is sourced
 path=(. $PLAN9/bin ./bin/ /bin/ /usr/bin) 
@@ -231,8 +222,8 @@ if(test -f etc/initrc.local)
 
 
 # Parse request URL
-uri = `{echo -n $REQUEST_URI | sed 's/\?.*//; s/'^$forbidden_uri_chars^'//g; s/\.\.*/./g; 1q'}
-ifs='/' { args = `{echo -n $uri} }
+uri=`{echo -n $REQUEST_URI | sed 's/\?.*//; s/'^$forbidden_uri_chars^'//g; s/\.\.*/./g; 1q'}
+ifs='/' { args=`{echo -n $uri} }
 
 
 if(! ~ $#debug 0)
@@ -244,9 +235,9 @@ if(~ $REQUEST_METHOD POST) {
     login_user
 }
 
-if (! ~ $args '') {
-    if (~ $args($#args) 'index')
-        perm_redirect `{ echo $REQUEST_URI | sed 's,/index$,/,' }
+if(! ~ $args '') {
+    if(~ $args($#args) 'index')
+        perm_redirect `{echo $REQUEST_URI | sed 's,/index$,/,'}
         
     pageTitle=`{echo $args | sed -e 's/ / - /g' -e 's/_/ /g'}
     req_path=$uri
@@ -256,28 +247,28 @@ if not {
 }
 
 fpath=$sitedir
-for (i in ('' $args)) {
-    fpath = $fpath/$i
+for(i in ('' $args)) {
+    # TODO We can build a list of paths here that can be used in sidebar, instead of iterating args twice
+    fpath=$fpath/$i
     # We don't want blog settings to cascade into posts, note that we are inBlog instead
-    if (! ~ $#blogDirs 0 && ! ~ $req_path */index.rss */index.atom */[bB]log */[bB]log/) {
+    if(! ~ $#blogDirs 0 && ! ~ $req_path */index.rss */index.atom */[bB]log */[bB]log/) {
         inBlog = $blogDirs
         blogDirs = () 
     }
 
-    if (test -f $fpath/_werc/config)
+    if(test -f $fpath/_werc/config)
         . ./$fpath/_werc/config
 
-    if (~ $#blogDirs 0 && ~ $#inBlog 0 && ~ $i [Bb]log)
+    if(~ $#blogDirs 0 && ~ $#inBlog 0 && ~ $i [Bb]log)
         inBlog = 'yes'
 }
 
 # Redirections and other preprocessing
-if (~ $#redirectPermanent 1)
+if(~ $#redirectPermanent 1)
     perm_redirect $"redirectPermanent
 
-if not if (~ $#redirectPermanent 2 && {echo $SERVER_NAME^$REQUEST_URI|grep -s $redirectPermanent(1) }) {
+if not if(~ $#redirectPermanent 2 && {echo $SERVER_NAME^$REQUEST_URI|grep -s $redirectPermanent(1) }) {
     # Experimental regexp sub-based redirect, probably should find a nicer interface
-    # For now only used at sites/harmful.cat-v.org/software/OO_programming/_werc/config
     to=`{echo $SERVER_NAME^$REQUEST_URI|sed 's@'^$redirectPermanent(1)^'@'^$redirectPermanent(2)^'@'}
     if(! ~ $to $REQUEST_URI)
         perm_redirect $to
@@ -291,7 +282,7 @@ if not
 
 
 body=$sitedir/$req_path
-if (test -d $body) {
+if(test -d $body) {
     if(! ~ $body */)
     	perm_redirect $REQUEST_URI^'/'
     body=$body/index
@@ -302,13 +293,12 @@ select_handler
 dprint $handler
 
 # Template/body selection
-master_template= `{get_lib_file $master_template}
+master_template=`{get_lib_file $master_template}
 
 if(~ $response_format html) {
     # Is awk_buffer really useful?
 	template $headers $master_template | awk_buffer
 	echo '</body></html>'
 }
-if not if (~ $response_format raw) {
+if not if(~ $response_format raw)
 	template < $master_template 
-}