Refactor tinkering