Re-factor

Re-factor