LUN-1630: code style changes