IntelliJRefactor

Marginally refactor the code using IntelliJ's built in suggestions.