Braces cleanup

Change-Id: I6ed221814912d80c6fdf41276d521b4da2345df2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>