some reorganization
don't think we need that