Refactor swizzling