Minor clanup