Tiny code refactor