Revert
Minor Refactor