doing some cleaning up