Changes by matglas86: Some code style changes.