Steam side effect, continue minor refactor.