IintelliJ analysis fixed some minor issues.