Moving inner call out of inner class