adjusting names and formatting code