some reorganizational cleanup