Little bit of cleanup, more generator goodness