Stackoverflow refactorings