Little cleanup, multiple model load for demo module