Final touches, naming and comments reorganized.