Refactored out some redundant codes
2 files changed