Minor Cosmetic Fixes