Removed inner class
Refactoring