massive cleanup/rewrite namsayne