Small amount of cleanup