Did a little cleanup