18488 - Style Fixes