Todo: Clean up & fix code style issues #35
Description
There's a lot of code that can be cleaned up here, and there are lots of messages and warnings about code style that I ignore but shouldn't—for example, many classes and methods can be marked as static but are not.
These things should be taken care of—this should also include what is mentioned in #33.