Did some cleaning up