code cleanup.  sorta.