clean-up, reorganization