Code cleanup
Refreshed data in a form that should allow loaddata.