Improved coding style as shown in examples fdo#75240

Change-Id: I6a19453637ea6de8e8c834ad14d7cdf712671e46