fixed some bad identifier names and formatting