Comments, minor refactoring.