New classes with initialisers
fixes on the formatter
Some optimisations for save memory