artginzburg cleanup a bit