Did a little bit of cleaning up