Some Minor Cosmetic Fixes