More Code Formatting courtesy of IntelliJ.