Clean up formatting for components and swizzle code