Code clanup