Extreme refactor