Another style improvement