a few changes to make code look nice