Fixing current/next instance

I overlooked that current/next instance was unnecessary--cleaning up
object model