Formatting
Use a decorator for model classes

Get rid of that big ugly if
Handle all iterables in EntityEncoder