meep cleaned things up a bit