Tidy changes from PR #1