slight clean-up