Doing some minor cleanup.