Code clean up to call shared instance methods
Method swizzling