Extract inner class to its own proper class
Extract inner class to its own proper class
Update whitespace
Extract out inner classes each to its own respective proper class