Switched to string interpolation
Comments and formatting