Irrelevant refactors