Working

more cleanup!