Code cleaunup