Moar lint

Disregard previous pull request, this one has both :)
A je to tut za revertat? Kao old-style vs new-style classes. :)