working #4 - cleaning up form enums