Refactored Steve-style