fixed comment, inner class naming