Some simple cleanup changes.