Fix minor checkstyle issuse in models A&AI