Cleanup and form to new model