Fix tabs/spaces formatting
Add more numeric operators to class methods