Removing one more unneeded inner class