Tiny refactor sequel