Tiny Refactor