enum code style update and cleanup