cleanup + address suggestions by Eric