refactor Steve