Little Refactoring