Refactor anonymous to inner class