clean-up. golfed version: 2252