Tried to do a little clean-up.