Performed IDEA reformatting to make the files more readable