Small code style change

Added brackets around all variables that have text behind them no matter
what it is (even if it would work anyways). It is much easier to be
consistent this way + things looks better in text editors.