Cleanup and form