Refactor to use string interpolation rather than hard-coding integers