Did a little clean up