But I'm always worried of turning a simple PR into a big refactoring job...