another little cleanup, and should be done!