Codestyle: Various codestyle related changes