Merge "format cleanup(intellij)"