Small code clanup