Yay! Nice cleanup!