Named inner class instead?