Reorganize and make small improvements.