Misc Style and Format Changes