Refactor: new-style classes
Fix: add new line at the end