Tidy-ups for Intellij