only show current variant type during edit
code clean up and refactor