reorganization & cleanup