and some cleaning up