Fix class name, added blank space, formatting, optional default class instantiation