Refactoring inner class to be static