Clean up some imports and form names