Issue #7: It doesn't look like the worst web page ever anymore, but it's
close
Issue #7: some quick cleanup