Clean up
Better constructor for models