General cleanup; working toward: websharks/s2member#151