Reformatting, first commit from IntelliJ