Done some cleaning up