Small refactoring and bug fix.
Merge branch 'master' of github.com:verse/verse
Merge branch 'master' of github.com:verse/verse
Remove obsolete comment.