Now with a whisper of refactor