Just some cleaning up