Codestyle fixes

Making Mr. Jenkins happy who refused to merge staging > master.