Fixed formatting and some naming errors