Tabs and space fixes, extraneous "Cx" template parameter

Removing extraneous template parameter and fixing spacing and style issues.