Use in class enum
Remove unnecessary public members; add friend declaration