re-arrangement/clean-up