completed form cleanup
ampersant convention change