Did a bit of cleanup