random refactor