Some slight clean-ups