1. Minor clean up.