Make a lot of changes to files (also IntelliJ reformatted all the code.)

read title (y)