Issue 794: additional code style changes