Some cleanup, some reorganization.