reorg cgi code a bit...