Eliminated one more anonymous inner class