Interpolation instead of string concat

Improvements in param checking