Used Intellij refactoring as well for some reason