Variant - minor cleanup
Variant - method template qualifiers added