Small Refactoring