Fast parameter without comma, using the bool variables in the .erb now

Removed the comma on the last parameter and switched to the $bool* variables for the if statements in the .erb file as they were already in place and it looks a bit more elegant than the suggested "||NO" suffix.