cleanup

Some streamlining.