More Refactoring
Further Refactoring