did some cleanup, that last commit had some nastiness in it