Accepted some intellij suggested refactoring.