randy refactor