Tiny Refactoring