Fix indent
Avoid unecessary test
Convert to new style class
Avoid "redefining" format