More clean-ups. It's close to perfect now.