improve swizzle