Fix code format
Fix test
Fix space size
Use new style object and super method