Better name for type class
Minor tweaks