remove a little complexity, perhaps