Refs #3495 - Add expressions to definition of classes, reindent, use of curled braced instead of parenthesis and move body classes added into library.st