Just some minor cleanup.