File cleanup.
Adjustments to class markers for form save