The great refactor \(^.^)/