Minor Refactor
Minor Refactor