adding some cleaning up