Cleanup whitespace
Use new style class initialization