fixed formating and naming conventions