Code Refactor
More Code Refactoring