Code Refactor Updates