Code restyling...
Code restyling - class templates added to all files