style updates; cruft removal