This makes the code easier to read.

Change-Id: Id0deca6e9bdbcf7291eaa30fda0ec5b76bbf5bf6
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>