Additional Refactoring