Improve comments, minor refactoring.