Couple quick bits of clean up