A little clean-up to make things a little easier