Fix issue #56. Make model_type a requirement argument. PEP8 cleanup.