Issue 794: code style changes