Fitting code style to existing project files

It seams that not all files where eddited with the same code style settings. Reformating exiting
code chnages some lines, but it's a much closer match.