(Issue 711) Minor style issues