fix some naming and formatting issues