Clean up some naming, formatting, and commenting