Small clean up and reorganization