cleanup features names and markup

cleanup features names and markup