Nice cleanup here!