Use splat operator and update formatting