reorganization
minor cleanups